Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 1 Apr 2010 21:55:28 +0000 (21:55 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 1 Apr 2010 21:55:28 +0000 (21:55 +0000)

Trivial merge